From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 1 Nov 2010 03:19:01 +0000 (-0400)
Subject: Fix to package name computation in Finder.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5850
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=93fa801f7dfd9467b3ab41132040f7219730f687;p=emacs.git

Fix to package name computation in Finder.

* lisp/finder.el (finder-compile-keywords): Don't use intern-soft,
since package names may not yet exist in the obarray.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bd884bdb265..0a1f54f9500 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,4 +1,9 @@
-2010-10-31  Chong Yidong  <cyd@stupidchicken.com>
+2010-11-01  Chong Yidong  <cyd@stupidchicken.com>
+
+	* finder.el (finder-compile-keywords): Don't use intern-soft,
+	since package names may not yet exist in the obarray.
+
+2010-11-01  Chong Yidong  <cyd@stupidchicken.com>
 
 	* vc/vc-arch.el (vc-arch-checkin):
 	* vc/vc-cvs.el (vc-cvs-checkin):
diff --git a/lisp/finder.el b/lisp/finder.el
index 8471edd57ff..655ad5383b0 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -198,7 +198,8 @@ from; the default is `load-path'."
 	      (setq summary  (lm-synopsis)
 		    keywords (mapcar 'intern (lm-keywords-list))
 		    package  (or package-override
-				 (intern-soft (lm-header "package"))
+				 (let ((str (lm-header "package")))
+				   (if str (intern str)))
 				 base-name)
 		    version  (lm-header "version")))
 	    (when summary